From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 21 Feb 2007 19:23:08 +0000 (+0000)
Subject: * fixing r20019: show searchForm every time to allow further searchings.
X-Git-Tag: 1.31.0-rc.0~53988
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=a4f4c7b3a69141b22efdfa5ac3160f92d56078c3;p=lhc%2Fweb%2Fwiklou.git

* fixing r20019: show searchForm every time to allow further searchings.
memo to /me: strike <hr> from vocabulary
---

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index e67d585318..ae133820f6 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -197,6 +197,9 @@ class IPUnblockForm {
 			}
 		}
 
+                # TODO: difference message between
+		#       a) an real empty list and
+		#       b) requested ip/username not on list
 		$pager = new IPBlocklistPager( $this, $conds );
 		if ( $pager->getNumRows() ) {
 			$s = $this->searchForm() .
@@ -206,7 +209,8 @@ class IPUnblockForm {
 				"</ul>";
 			$s .= $pager->getNavigationBar();
 		} else {
-			$s = '<p>' . wfMsgHTML( 'ipblocklistempty' ) . '</p>';
+			$s = $this->searchForm() .
+				'<p>' . wfMsgHTML( 'ipblocklistempty' ) . '</p>';
 		}
 		$wgOut->addHTML( $s );
 	}
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 06dbf98226..908c8d2fa3 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1462,7 +1462,7 @@ Zur Aufhebung der Sperre siehe die [[{{ns:special}}:Ipblocklist|Liste aller akti
 'anononlyblock'               => 'nur Anonyme',
 'noautoblockblock'            => 'Autoblock deaktiviert',
 'createaccountblock'          => 'Erstellung von Benutzerkonten gesperrt',
-'ipblocklistempty'            => 'Die Liste der Benutzersperrungen hat keine Einträge.',
+'ipblocklistempty'            => 'Die gesuchte IP-Adresse/der Benutzername ist nicht gesperrt oder die Liste enthält keine Einträge.',
 'blocklink'                   => 'sperren',
 'unblocklink'                 => 'freigeben',
 'contribslink'                => 'Beiträge',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 28724b5f19..87aee37d20 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1903,7 +1903,7 @@ to a previously blocked IP address or username.',
 'anononlyblock' => 'anon. only',
 'noautoblockblock' => 'autoblock disabled',
 'createaccountblock' => 'account creation blocked',
-'ipblocklistempty'	=> 'The blocklist is empty.',
+'ipblocklistempty'	=> 'The blocklist is empty or the requested IP address/username is not blocked.',
 'blocklink'		=> 'block',
 'unblocklink'	=> 'unblock',
 'contribslink'	=> 'contribs',